Remove deprecated code: GtkCheckMenuItem

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index d1c366e8a63e7f759392d8856f2ab620be805527..8fd825ae5f4b270fb69604191372e664fccd6df6 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -655,10 +655,8 @@ GtkCheckMenuItem
 gtk_check_menu_item_new
 gtk_check_menu_item_new_with_label
 gtk_check_menu_item_new_with_mnemonic
-gtk_check_menu_item_set_state
 gtk_check_menu_item_get_active
 gtk_check_menu_item_set_active
-gtk_check_menu_item_set_show_toggle
 gtk_check_menu_item_toggled
 gtk_check_menu_item_get_inconsistent
 gtk_check_menu_item_set_inconsistent

diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
index 7ee3e06a0402c324addaef014fcca01036ad5db4..8d83732199e303fcd9e7c8765fb990c2d4da97d5 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
@@ -102,14 +102,6 @@ Creates a new #GtkCheckMenuItem with a label.
 @Returns: 
 
 
-<!-- ##### MACRO gtk_check_menu_item_set_state ##### -->
-<para>
-Sets the active state of the menu item's check box.
-</para>
-
-@Deprecated: Use gtk_check_menu_item_set_active() instead.
-
-
 <!-- ##### FUNCTION gtk_check_menu_item_get_active ##### -->
 <para>
 
@@ -128,17 +120,6 @@ Sets the active state of the menu item's check box.
 @is_active: boolean value indicating whether the check box is active.
 
 
-<!-- ##### FUNCTION gtk_check_menu_item_set_show_toggle ##### -->
-<para>
-Controls whether the check box is shown at all times.
-Normally the check box is shown only when it is active or while the 
-menu item is selected.
-</para>
-
-@menu_item: a #GtkCheckMenuItem.
-@always: boolean value indicating whether to always show the check box.
-
-
 <!-- ##### FUNCTION gtk_check_menu_item_toggled ##### -->
 <para>
 Emits the GtkCheckMenuItem::toggled signal.

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index ab3e3d46c1701b7e86e2dc1992cf0a5cf8501387..5ec20e7d447c56e3f05b1c02c841577e07ffdac5 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -709,9 +709,6 @@ gtk_check_menu_item_new_with_mnemonic
 gtk_check_menu_item_set_active
 gtk_check_menu_item_set_draw_as_radio
 gtk_check_menu_item_set_inconsistent
-#ifndef GTK_DISABLE_DEPRECATED
-gtk_check_menu_item_set_show_toggle
-#endif
 gtk_check_menu_item_toggled
 #endif
 #endif

diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 8c77d618e4be78c3ee327e3615869f33c68597c5..754382f00ecc0cdad240d0f2118330bfcdf062c8 100644 (file)
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -282,17 +282,6 @@ gtk_check_menu_item_toggle_size_request (GtkMenuItem *menu_item,
   *requisition = indicator_size + toggle_spacing;
 }
 
-void
-gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
-                                    gboolean          always)
-{
-  g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item));
-
-#if 0
-  menu_item->always_show_toggle = always != FALSE;
-#endif  
-}
-
 void
 gtk_check_menu_item_toggled (GtkCheckMenuItem *check_menu_item)
 {

diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index b6f2e9adfe9f799434b9f4e17003ae873e79b5fe..2361c05d38b5e27c772a7c49cc2ff108bc2a010a 100644 (file)
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -91,12 +91,6 @@ void       gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_i
 gboolean   gtk_check_menu_item_get_draw_as_radio (GtkCheckMenuItem *check_menu_item);
 
 
-#ifndef GTK_DISABLE_DEPRECATED
-void      gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
-                                               gboolean          always);
-#define        gtk_check_menu_item_set_state           gtk_check_menu_item_set_active
-#endif
-
 G_END_DECLS
 
 #endif /* __GTK_CHECK_MENU_ITEM_H__ */

diff --git a/tests/testgtk.c b/tests/testgtk.c
index a8d51446967777f3726aad72f3c86877c17df3c1..bfe57340b7e4dd8fda5c10bd10a84be95e243e23 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -4155,11 +4155,6 @@ create_menu (GdkScreen *screen, gint depth, gint length, gboolean tearoff)
       menuitem = gtk_radio_menu_item_new_with_label (group, buf);
       group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
 
-#if 0
-      if (depth % 2)
-       gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
-#endif
-
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
       gtk_widget_show (menuitem);
       if (i == 3)